# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1383  -> 1.1384 
#	drivers/acpi/pci_irq.c	1.19    -> 1.20   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/07/14	willy@debian.org	1.1373.1.98
# [PATCH] ia64: use has_8259 in acpi_register_irq()
# 
# acpi_madt is marked as __initdata, so an attempt to use
# acpi_register_irq() after we discarded init sections would cause us to
# dereference a random location.  Everywhere else uses has_8259 anyway.
# --------------------------------------------
# 03/07/14	davidm@tiger.hpl.hp.com	1.1384
# Undo (most of) the ia64-specific changes to pci_irq.c.
# iosapic_parse_prt() is the right place to do those.
# --------------------------------------------
#
diff -Nru a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
--- a/drivers/acpi/pci_irq.c	Wed Jul 16 00:38:53 2003
+++ b/drivers/acpi/pci_irq.c	Wed Jul 16 00:38:53 2003
@@ -253,8 +253,6 @@
 		return_VALUE(0);
 	}
 
-	entry->irq = entry->link.index;
-
 	if (!entry->irq && entry->link.handle) {
 		entry->irq = acpi_pci_link_get_irq(entry->link.handle, entry->link.index);
 		if (!entry->irq) {
@@ -363,11 +361,7 @@
 		}
  	}
 
-#ifdef CONFIG_IA64
-	dev->irq = gsi_to_irq(irq);
-#else
 	dev->irq = irq;
-#endif
 
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device %s using IRQ %d\n", dev->slot_name, dev->irq));